Merge changes I5b2973c1,Iaa535450 into udc-dev-plus-aosp am: 751f9828

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



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