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

Merge changes from topic "am-87b917ecc64245d2b1700a4be7e0896e" into tm-qpr-dev-plus-aosp am: 3b0844be -s ours

am skip reason: Merged-In Idb83c6e6e416665405fbe498dce8d56a3cdf857c with SHA-1 d9f9844a is already in history

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



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