[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: d1e4909d am: bd969cea -s ours

am skip reason: Change-Id Iba76866c0e33a9fb69ba6798ebc8ffc9677a5dc7 with SHA-1 1c62f691 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I390a5cc2caf1206c5f05e3b1d57f2c88a021a11f