Merge "Use phoneAccountHandle based on connection" am: eb87a5267f am: 4ab9a5ea60

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1428408

Change-Id: Ibe583151729e8d9683b3df2159689e9e7249b7cc