[automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: 50aaae95ad -s ours am: 0a2fd68e62 -s ours

am skip reason: Change-Id If4a971bc96a160a188623d8b0b9242e863f5bb2f with SHA-1 d8f7d139b8 is in history

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

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