[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: ffbacc9a11 -s ours

am skip reason: subject contains skip directive

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

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