Merge changes from topic "am-4493549d7d1a410f880c7c44afed2208" into udc-dev am: 6dea4048

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



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