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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I757c8b75b292f2d560c320e36c58eae41c24b6b2