Merge "Add android.provider.Telephony to public API." into klp-dev