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