[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 253d4be6 -s ours am: 10530877 -s ours am: d7f69244 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic887d2d02bda197825fc6261705919d00ddb7176