Merge "Use sendBroadcastAsUser rather than sendBroadcast"