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

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

Change-Id: I59fb9e88504c74d6baeff4a0e4cf7e01f6396ebe