[automerger skipped] Merge "Merge RQ2A.210305.007" am: 7051b94de1 -s ours

am skip reason: Change-Id Id3c908d728c672c407b2166b78fd0c682ed902bb with SHA-1 57c91a2608 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3035bb5378593ae7d85acfa5429bd855f050a40
tree: b1424062beabf8aeb90cf9ef402098d9e933e8b7
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS