Merge "Merge "Move android.provider.Telephony to frameworks/base/core" am: 4d0df870 am: 9b84a44f am: fba2c804"