[2/2] Framework: add option to hide power menu when screen is locked

Change-Id: I0de1501d0ecedb7b9b08fbb3aebaecd0e63cc09e

Conflicts:

	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java