Revert "Revert "PhoneWindowManager : bring inline with Slim handling of volume wake and cleanup""

This reverts commit c325232c087b707624e330ec06db64297d824dc4.

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java