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

Merge changes from topic "cherrypicker-L89600000960032981:N30900001359241375" into udc-dev am: 1c7a8919 am: 8f871c82 am: 7342b044 am: d14aa337

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



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