Add battery level around unlock ring

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

cherry-pick error 'Add battery level around unlock ring' fix

missed value

missed value

Lockscreen Notification (1/2)

Change-Id: I90d597a780ddcd8e60ee28d5710fb91d893093af

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

cherry-pick error

Revert "Lockscreen Notification (1/2)"

This reverts commit 43424504386c146b7d729e2db33c769b5c8a710f.