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

Change-Id: I9aab1a8bfe10a2fd661e0bd19452b4a66f6e1a2f