Only show ART information if switching from dalvik to ART

We do not want to confuse users with a big information dialog, if
they change from ART to dalvik as dalvik is still the official
solution, supported and considered safe.

Change-Id: I0ce4846e0bb751e87e5c410e668d4bc521380141
Settings: Added choice of 45 seconds for screen timeout, lock screen and dream.

Change-Id: I58cb14776fe9d447b79faf810d7f6142bc058341
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