Merge 24Q3 to AOSP main Bug: 357762254 Merged-In: I955a49b843159ea7b70371580cd8b193b971d1d2 Change-Id: I59c8a137fd7bb191906f13db0d67b02dc9384b61