[automerger skipped] Merge ab/7061308 into stage. am: 57c91a2608 -s ours am: d362038d1c -s ours

am skip reason: Change-Id I6f848acd1520828c24d4e4bd285d9025c51118f0 with SHA-1 ae189db200 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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