[automerger skipped] Merge "Add new Telephony API for settings migration" am: adbe45e0ca am: 93518497b1
am: e4f3b9580f  -s ours

Change-Id: Ic341e4c8a1eaee22da51c7344f6ffdacec3ccf46