[automerger skipped] Merge Android U (ab/10368041) am: ea114af46f -s ours

am skip reason: Merged-In Idfa102e3171cfc24972a72a4ab094e92e494aa9a with SHA-1 f067dc487b is already in history

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

Change-Id: I6f39532134f8dd6b1ff50d80bebfa33a905fd45e
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 588579d20c1145adf6a59f18c4f58b9076cdb314
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS