[automerger skipped] DO NOT MERGE - Skip RP1A.201005.006 am: 6f11dafd7e am: 16718f77a2 am: 658b322cf8 am: 2350e887cb -s ours am: 5c12d8b739

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

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