Merge "Rename REGISTRATION_ERROR protected broadcast"
am: 21c2702069

Change-Id: Ibf000e901e96c7938b03b95de19c4eb5506913f1