[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 0799274e9c -s ours am: 21e0c6ca6e -s ours

am skip reason: Merged-In I9936a3eac58497f7e54184499d9bc04d40696e03 with SHA-1 6c821e60ac is already in history

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

Change-Id: I868cf5dca2e28681be4f0223af9db7cd85a6a84c
tree: a1185e62fc5abd02dd9338fbb0e950f6068eda7a
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS