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

Change-Id: I1015777c7fa0e5b67ea3d9da4c14036842b527aa