[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L13000000961026483:N74600001374579948" into udc-qpr-dev am: 823c0cbd -s ours am: 4185d2bd -s ours

am skip reason: Merged-In I8e77238d85cfa91bd7b53e20ad42bd195160fb04 with SHA-1 e7a26adc is already in history

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



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