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

Change-Id: Iadd3090f6e73920844f7ba02f09ebb92d3095452