[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 18cd1784cf -s ours

am skip reason: Change-Id I3ded251721193e101437127b6ec9e6c141b7d3da with SHA-1 3aa98472ec is in history

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

Change-Id: Ic267f25e5e371d634840beeca7e610a59a10c969