Merge 24Q3 to AOSP main Bug: 357762254 Merged-In: I7841e617e395465c36ac63ad5474bfe53e538690 Change-Id: I6f78e6490fb9d8e279409b52c696d2585d50bd0f