[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: b48d386765 -s ours

am skip reason: Merged-In Iccc0af31df1175709b22a47b43684d8a733d24e1 with SHA-1 7f04416faf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/27908801

Change-Id: Ieb430f27261dbdc8330ce2f62913a961ad2c32ad
Signed-off-by: Automerger Merge Worker <[email protected]>