[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 732e904042 am: a0249d2f9f -s ours am: e253804d89 -s ours am: 7c0485f727 -s ours

am skip reason: subject contains skip directive

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

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