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

Change-Id: Ibef988b2491c32f16c806402f907db1754a22fb2