Merge changes from topic "am-ba41ab72133c4211aba3ec5409a124a5" into...

Merge changes from topic "am-ba41ab72133c4211aba3ec5409a124a5" into udc-qpr-dev-plus-aosp am: a003547c -s ours

am skip reason: Merged-In I42b6cbca60db6ce1a073254239b48e9104c4ebfb with SHA-1 382a9eaf is already in history

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



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