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

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