Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()""