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

Change-Id: I20da5a72e5a9bdf35ee8750bafe838dda27d0857