[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-09407ffd8dc149d78a50180b106c59fc" into sc-v2-dev-plus-aosp am: c450e4f7 -s ours

am skip reason: Merged-In Id865ef3f55f3cf006fd94d7b376d1b87ad999ca5 with SHA-1 676764f2 is already in history

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

Change-Id: I891f3d09389be14798f0f8cb862ee46e0a32458b