[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into...

[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: f4342415 -s ours

am skip reason: Merged-In I2094ab904a34104089f29a219596e61a7317e00b with SHA-1 abb7ad47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14974089

Change-Id: I9d500f30c028481e56f619402ef92ad35d7c83b8