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

[automerger skipped] Merge "Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: faec0676 -s ours am: 9d751d63 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I151731c4af667a60fa754c24492f6993ca6c5c71