Bye Bye Holo Blue Light

Change-Id: I2c2029dd4bedf8d733fd862f00445d8bfe8c9acf
Revert "base: Volume button wake: simplify logic"

This reverts commit e7da4e5d3a43f06fa14e37247f105a3850c11f8f.