[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: 4b95f99142 am: 1913763c72 -s ours

am skip reason: Merged-In Ib6a3d24e07915e8af9d019e54d0501b74aa4671d with SHA-1 346292cea9 is already in history

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

Change-Id: I95196a7af17ec91152e3d88b4bd8dcfd838ae605