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

Merge changes from topic "am-d925c47a33f9421884915d19b487219a" into tm-d1-dev-plus-aosp am: 0b5cb287 -s ours

am skip reason: Merged-In I0d776f3fbdbba925cf1ac272270fb36f286dff91 with SHA-1 436c4c88 is already in history

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



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