Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ia9c4fb8f09f3f42b3a081d2a9ad9f8a2d3db4856
Change-Id: I678464bd4988e452e88f3593fac8b4837aee70e3