Merge AP4A.241205.013 into aosp-main-future

Bug: 370570306
Merged-In: Ic18b7d821cd92004787384567e1fb1d9670cff00
Change-Id: I8eb56d8155c8dfab2aa6264dee1c1191c9a05b43