[automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE am: 7c51d435e9 -s ours am: f74d61e349 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6de77b6a3723a2b9015056c73694cac59520ab6d