Merge "Move android.provider.Telephony to frameworks/base/core" am: 4d0df870cd
am: 9b84a44f04

Change-Id: Ib87b7648cf7cc19b267770a6f1fd910f751c7ab8