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

Change-Id: I749e98ea84dd8c3811d302848a14576c6aff8fb1