Merge changes from topic "cherrypicker-L12700000961523212:N62700001381640113"...

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

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



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