Merge 24Q3 to AOSP main Bug: 357762254 Merged-In: I0e7964742eaef420896facb906b505f38e38ee48 Change-Id: I3d5a5aaa7634dc2457a8ccb43eb692b25933fc56