second clock

wrong position in settiong.java

Update Clock.java
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