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

Change-Id: Ie3b4c9529cc4279f0caf462efaca18d06689f629