[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136"...

[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: 01a6269a -s ours am: d729d160 -s ours

am skip reason: Merged-In I6db4a66039f0455c566e2ab009effc4a5b7f37be with SHA-1 bae7e457 is already in history

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



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