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

[automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: 932a856c am: 2b651717 -s ours am: 309519f1 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25588b11b80bcba0d8091c830428a65874e7c8a4