[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-be72c2c8f7fb4abdbb49e69638f46fce" into sc-dev am: 27eb1a55 -s ours

am skip reason: Change-Id Ib4a6232ce8bbec6d5a521391b84ba4538a49d618 with SHA-1 f1998d5e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5c72fb5441a5b7c29ff474523e309ddfcff0faa