Merge "Use phoneAccountHandle based on connection" am: eb87a5267f

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

Change-Id: Ia95430a2965e8647faa3ce19d04ae55be7e2769e