Merge changes from topic "cherrypicker-L12700000961523212:N62700001381640113" into udc-dev-plus-aosp am: cf633f54c7 am: 4a3a0cf596

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

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