Merge "Do not use sendOrderedBroadcastAsUser"