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

[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: 79a6cde9 -s ours

am skip reason: Merged-In I823be4f424c942834316106b5f93af5f77005cdc with SHA-1 193f7ca8 is already in history

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



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