[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 0a7335dc60 -s ours am: 6bf4060ba8 -s ours am: 07c0f71192 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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