[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-cef57061f522495fac4255c1ed6d6c85" into sc-dev am: 582f21bc -s ours

am skip reason: Change-Id Ica1a7256a71ba58f3b24b936c8053dbd8a596475 with SHA-1 627c3b7c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6755c74daf400964f15bc214d5db5e0ae88f7b29