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

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

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



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