[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: 4b95f991 am:...

[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: 4b95f991 am: 1913763c -s ours am: 7915c761 -s ours am: bc9fc46f -s ours

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

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

Change-Id: Icc1bdc830eaa14b05dc8e4348acb59c1e5c523d0