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

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

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