Merge 24Q3 to AOSP main Bug: 357762254 Merged-In: I9183c2f8b1cae60b705016804cb36780513be854 Change-Id: I927350c62d8365deec9efd6f5b782719deb352f6