Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ia4adb4190b52d409539da9a275c3a31f1bce5018
Change-Id: Ifc5306b845f9802a47eb471e284b58e362ab2bea