[automerger skipped] Merge 10952656 am: ea9a38b249 -s ours

am skip reason: Merged-In Ie5caa1b4d29923504bf2783909ae8d83f3265933 with SHA-1 d9ef5346f6 is already in history

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

Change-Id: I5be930721e0cfd9703e185ca0d8d8406a4737052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 588579d20c1145adf6a59f18c4f58b9076cdb314
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS