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

Change-Id: I7c8240d0fc554c872624c650294709019793bf6f