Merge changes from topic "cherrypicker-L37800000960770833:N73100001370865678"...

Merge changes from topic "cherrypicker-L37800000960770833:N73100001370865678" into udc-dev am: d6046eef

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



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