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

am skip reason: subject contains skip directive

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

Change-Id: I91d05fc475b210a269d3da8da693caf0f9605418