Merge changes from topic "cherrypicker-L79100000958869288:N59400001342229132"...

Merge changes from topic "cherrypicker-L79100000958869288:N59400001342229132" into udc-dev am: 4e192160

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



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