Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I9e428cdc69dd03e70f03ca60fe3a7f0c5d599def
Change-Id: I39cfc942685c31c78e5fe477cd0ece543609174b