Merge changes from topic "am-87ccba4480374e9fb46f4c8d8e3052f7" into...

Merge changes from topic "am-87ccba4480374e9fb46f4c8d8e3052f7" into udc-qpr-dev-plus-aosp am: ed7ba986 -s ours

am skip reason: Merged-In I8084b48b4a181e87bd151bc2870eddad36ae3a0b with SHA-1 04c36855 is already in history

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



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