Merge "Make com.android.ims.REGISTRATION_ERROR a protected broadcast" into nyc-mr1-dev