[automerger skipped] Merge 10952656 am: ea9a38b249 -s ours am: e858bff587 -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: I3da455920dd7964763f76cc64fc65e9f9a381bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: d3d0c0c955bbd49a168ff708f902041cba1e30b9
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS