Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: d1e4909de0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib09837228ae9de09561631c9bf06ad193a79712d