[automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO...

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

am skip reason: subject contains skip directive

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

Change-Id: Iec8ea46b20a4475c9b348c2dcbddec43f68ffece