[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: b233985e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I62e7ed05c77b07d3dd3a02b72e89ae4585a17714