Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Idb9fbd08a1bd2c517804a03fee54a77f93df8f92
Change-Id: I6bf8127f4f9cbfaae6d98e5a1a53817994157b93