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

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