Merge changes I3ef77f56,Ia774f27a into udc-dev-plus-aosp am: d82a3c785e am: 1ad91b34d6

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

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