Lockscreen custom wallpaper [2/2]

Change-Id: I89c21b506224a5141d0d8bd555de3f7d462324bd

Conflicts:

	res/values/hyperion_strings.xml