Merge AP4A.241205.013 into aosp-main-future

Bug: 370570306
Merged-In: I75ae80bacb1ea630c57434a5b21a3e30ae02b663
Change-Id: I09d2485bb64034c348c3fb424383142575ef0d83