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: I458a228b4d1e172420cd19c0a939f27e56199c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>