Merge changes from topic "am-7479dd9006a7429db471b5ad21414a67" into...

Merge changes from topic "am-7479dd9006a7429db471b5ad21414a67" into udc-d1-dev-plus-aosp am: a29bd6f2 -s ours

am skip reason: Merged-In Icd0f2307803a1a35e655bc08d9d4cca5e2b58a9b with SHA-1 38a83cae is already in history

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



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