[automerger skipped] Merge "DO NOT MERGE - Skip RP1A.201005.006" am: ebb6703705 am: b94ba72715 am: 888595a0c3 am: c6fe0b3d5d -s ours

am skip reason: subject contains skip directive

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

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