Merge "Make android.provider.Telephony.SMS_REJECTED a protected intent." into nyc-mr1-dev