[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-013f845bb1f04ba58c77600215b44d13" into sc-v2-dev-plus-aosp am: b9af4bdf -s ours am: 3b8032ad -s ours

am skip reason: Merged-In I866fbb6ee4452372d6bedab44345de28fdadda7f with SHA-1 667374a4 is already in history

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

Change-Id: Id65b882e1f130beaaab7cafa813f1d277fbbb83d