Revert "DO NOT MERGE ANYWHERE"

Reason for revert: Conflicts with QPR3

This reverts commit cbcb3ba0.

 Conflicts:
       packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
       packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java
       packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java

Change-Id: Ic6a8799b76531e0547e77fbb77e1ebabf437d7eb