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

am skip reason: subject contains skip directive

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

Change-Id: I80fcd0be0b0dbf9d2e056ef3c8919a2b7a70a035