Merge tag 'android-15.0.0_r6' of https://android.googlesource.com/platform/system/extras into HEAD

Android 15.0.0 Release 6 (AP4A.241205.013)

Change-Id: I14fccb01908d6deb59209ce8f3245c204c5b5045