[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-5c9c0da14f38421793426338ea8a4028" into sc-dev am: 51875d7b -s ours

am skip reason: Change-Id I9b41fc700cf76c6a6a789b5beabe4f93dd82ce8b with SHA-1 6921ca60 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8b905cbf7f1451f2297ad7be92f6b644722a08a