[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 7ec5e374b4 am: c41eb33923 -s ours am: aac1481ff5 -s ours

am skip reason: Change-Id Ic51abab262433b1d5434436ddd386cef10cf6102 with SHA-1 0a2fd68e62 is in history

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

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