Merge "Rename REGISTRATION_ERROR protected broadcast" am: 21c2702069 am: 58edbce30e am: 02262d72f3

Change-Id: Id3a0e6d9e303db0e5f1b5843a8ce739b087adf73