Merge changes from topic "cherrypicker-L29900000960317420:N81800001363346124"...

Merge changes from topic "cherrypicker-L29900000960317420:N81800001363346124" into udc-dev am: 7fc85867

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



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