Merge changes from topic "am-0c0ac19854ca4645853adfde99080086" into...

Merge changes from topic "am-0c0ac19854ca4645853adfde99080086" into udc-d1-dev-plus-aosp am: 4d83fe78 -s ours

am skip reason: Merged-In I41dde165a5eba151c958b81417d9e1065af1b411 with SHA-1 05f6e7b4 is already in history

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



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