add missing symbols
	modified:   core/java/android/provider/Settings.java
lockscreen battery status: add off option (2/2)

Change-Id: Ie10015865f161e783dc394d467e456d51dc9fbbc

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

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

	modified:   core/java/android/provider/Settings.java
	modified:   policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java
	modified:   policy/src/com/android/internal/policy/impl/keyguard/KeyguardUpdateMonitor.java
fix up build
	modified:   core/java/android/app/AppOpsManager.java
	modified:   core/java/android/provider/Settings.java
	modified:   core/java/com/android/internal/app/IAppOpsService.aidl
	modified:   services/java/com/android/server/AppOpsService.java
	modified:   services/java/com/android/server/power/PowerManagerService.java