Merge "Move android.provider.Telephony to frameworks/base/core"