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

Change-Id: Id6a33d0d2667c7b8dc16c4ca9539ef17ec3ae2e6