[automerger skipped] Merge Android U (ab/10368041) am: ea114af46f -s ours am: eb0bb2b709 -s ours am: 8c14b89e62 -s ours am: 356d02ae1b -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: I1889c85f4a7ae1a8d41e0a5743d81a5a748f5ae6
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