Merge 24Q3 to AOSP main Bug: 357762254 Merged-In: I0ab6a50e5e0921da1770d51a7cf730dbbf2c94a7 Change-Id: I977fa4bda69cda8c74f42773710024726cb6a1d6