Merge changes from topic "cherrypicker-L89600000960032981:N30900001359241375"...

Merge changes from topic "cherrypicker-L89600000960032981:N30900001359241375" into udc-dev am: 1c7a8919

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



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