Merge "Protect broadcasts we use to talk to settings" into pi-dev
am: 3dbd752246

Change-Id: I0e3edd011cd148a93a5b92b21fb706bc03a8e4b0