[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 skip reason: subject contains skip directive

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

Change-Id: Ie1f31e9e9840765305460daff2032b77ca588989