[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 680c8b6cfe -s ours

am skip reason: Merged-In I67cd2b5177e611f9dca8a7aa901eb0792d0bedc9 with SHA-1 decf95a8d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/20947038

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