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