[automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: b253e8f9 -s ours

am skip reason: Merged-In I80ec1e02e395f8eaef6c3eaec3c1045750e932f2 with SHA-1 246e03a0 is already in history

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

Change-Id: I71258c6be83f1dd264c8be7445c08bb726b432ed