[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L79100000958869288:N59400001342229132" into udc-dev am: 4e192160 am: 5c1b94ab -s ours

am skip reason: Merged-In I9176954db677fed5dcf762380cfcc77f888a48de with SHA-1 ca2e9d4a is already in history

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



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