Volume rocker wake: Clean up [1/2]

This reverts commit 1efcfe5f945c42d6f3353aa4d3b65e0c6af0b578.

Conflicts:
	core/java/android/provider/Settings.java