[automerger skipped] Skip ab/6749736 in stage. am: 9097e07c4b -s ours am: d8f7d139b8 -s ours am: 4617ec9c82 -s ours

am skip reason: Change-Id I7f0f8a931ea3c690f4f4026923231aae88df514e with SHA-1 335f5260b2 is in history

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

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