This reverts commit e6243996. Bug: 129721367 Test: change volume in Play Music (cherry picked from commit ab3a3f8c) Change-Id: Id6e63e87265717130dde0e1b46e28edbb0b53edb