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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12d720126831f42611f0da0ac22751694b7df4be