[automerger skipped] DO NOT MERGE - Merge Android 13 am: 615a317ea1 -s ours

am skip reason: Merged-In I11dd4798f655df2b4abb18b2658024979cc10eaf with SHA-1 3aa2059c68 is already in history

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

Change-Id: Icee7e2a47215578c25bdbbe6716f5ab8418d13aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>