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