fix number picker blue line and highlight

Change-Id: I473c855a0e2cd068e62cd2ec4b807c04215b1c81

Conflicts:
	core/res/res/values/colors.xml
Fix CYAN-3555 bug

This commit fixes typo which is in AOSP tree.
I hope it's possible to merge it.

Change-Id: Ifdf9c5d90b9850b6112ee11a9b1aa3b1576348a0
Signed-off-by: jereksel <jereksel@gmail.com>
Core/Keyguard: Cleanup CAF additions

Change-Id: I12619aedc459ffed514b1eb2c19dd57e6f535522