[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 50cb410d -s ours am: b880ec28 -s ours am: 869385ac -s ours am: e9c14e46 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I06b339729a6a7a114f374f76b19d2032beb16ac0