[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 580d6ea3ad -s ours am: 8a827d5296 -s ours

am skip reason: Merged-In I0cdd30c1c199b9aee73fa4bcce9efbc4e0d7ff8d with SHA-1 6e4cdd28cf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/20948069

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