[automerger skipped] Revert "Do not use sendOrderedBroadcastAsUser" am: 3e1fb09813 am: 420b213507
am: 5758a6e0b6 -s ours
am skip reason: change_id I229baf74c55a235e82ea9ae2c6d5b52c26dd6297 with SHA1 f972a602d3 is in history

Change-Id: Iaddacf649f57bd7cb5d3de875511b338e48346a8