Merge "Revert "Revert "Move DozeServiceHost out of StatusBar."""