Add wallpaper pickers to seperate package [2/2]

Change-Id: I233b90aa52b5a8c408fa3adfe3bdad07330cc2ad
Conflicts:
	res/xml/lockscreen_interface_settings.xml
	res/xml/theme_settings.xml