[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L37800000960770833:N73100001370865678" into udc-dev am: d6046eef am: 678c02c6 -s ours

am skip reason: Merged-In I40ace4a68bf09886bd54049ac5d9d9c4d6e9f444 with SHA-1 11b60d2b is already in history

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



Change-Id: Iaf11a98b0ef65710ee0e5d2974a9a5d25fe589af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>