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

am skip reason: subject contains skip directive

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

Change-Id: I25750849596fae95c8647b4111104bf8dff1e56c