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

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

am skip reason: Change-Id I3157d3e53a6fc3fcf09fce41d8de75a039dd2ad5 with SHA-1 2380e64d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia254e6eb4793f4496eb59b9e81ceae10a4bafe8d