Merge changes I5e3a8b02,Ie3995fb9,Ie8b4d2c8 into udc-dev am: 7d1066db am:...

Merge changes I5e3a8b02,Ie3995fb9,Ie8b4d2c8 into udc-dev am: 7d1066db am: c308a822 am: f631809c am: a0d4119a

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



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