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

am skip reason: subject contains skip directive

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

Change-Id: Ie8def58ba27250a1a6f1cb8121aa6c5c42fa60ae