Merge changes from topic "am-9fd462053d914f78889803fbb5a802d7" into...

Merge changes from topic "am-9fd462053d914f78889803fbb5a802d7" into tm-d1-dev-plus-aosp am: 519e8fac -s ours

am skip reason: Merged-In I44ca83cbef38b2b5473f54a40c457298dee48e0c with SHA-1 4eea3f4e is already in history

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



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