[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: acb6e110d2 -s ours am: 6daa751938 -s ours

am skip reason: Merged-In I7cdac3086d5c976e5dbe24e8bb06a433058c32af with SHA-1 522087e4f4 is already in history

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

Change-Id: If676fdb07ba976abf9b841612286cc02e69fba1c
tree: 4722c277427fbc5d3e1d9a2e2e103af9df98895d
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS