Merge "Sync phoneAccountHandle when phone is changed" am: a301f8adc3

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1428428

Change-Id: I352101d8fd2d8815109498778ba9417becbe98cb