[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 5dc1d3ad -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: Ibd20cbb36407244907d3db14d764baffb66ef341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>