Merge AP4A.241205.013 into aosp-main-future

Bug: 370570306
Merged-In: Id1c9d392c2ec646774788b1f1066a3fbcf16f84a
Change-Id: Iebfe3bc7abb2b76bac0f165f9dbc8226b98d8f11