Lockscreen Targets (PA)

Conflicts:

	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml

Change-Id: I0a5d249e476a3ffafd77650cc3146a219e4185ac