Merge "Add new Telephony API for settings migration" am: adbe45e0ca
am: 93518497b1

Change-Id: I0bbd4ff9b325d481c7697cb823f3585448b25180