Settings: status bar notification count (2/2)

credit: burnsra & rmcc (cm)
Settings: status bar signal text style (2/2)

credit: burnsra & rmcc (cm)
Separate Android Encryption Password from Lockscreen Password

This permits the use of a different (hopefully longer and more complex!) encryption
password, while using a simpler (and easier to type) lockscreen password.

Change-Id: Ib8c62c8eb4c86cd9e0117444231e8139c08ad1b6

Conflicts:
	res/values/custom_strings.xml