Merge "Use sendBroadcastAsUser rather than sendBroadcast" am: d129a14647 am: 93b232db41
am: 95eab26704

Change-Id: I3fee39d494d9ea041351218e72ebbe65bdb07637