Merge "[automerger skipped] Merge changes Iba03d8b8,Ic2bc89bb into...

Merge "[automerger skipped] Merge changes Iba03d8b8,Ic2bc89bb into android10-tests-dev am: f29f5bd8 -s ours" into android11-tests-dev am: 13e2c8a0 -s ours

am skip reason: Merged-In Iba03d8b8c48351a8cc4f2ed3eb2451d649ad8cac with SHA-1 621a28ad is already in history

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

Change-Id: I2612f21953ded189edfbe317da5a3a53ae9142dd