[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 skip reason: Change-Id If01c89c950ca18036e4826decea118ddccb8a1f6 with SHA-1 bf42c01f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e472dc556c5ff25c80e4569d00f6c2e82aa7183