Merge "Make com.android.ims.REGISTRATION_ERROR a protected broadcast" into nyc-mr1-dev am: 57cbc93da3
am: f230fc1a06

Change-Id: If8fb0309e11441e938e87cf5538df280606a021a