Settings: Fix lockscreen security strings

Change-Id: I9e35108cc7a0d65c80cc87ad9502c9ffdc29847a
Settings: Remove owner info from lockscreen options.

Change-Id: I5c1133e4aabe0c0c53472096bd8e7099690715c5
Settings: Remove V+ pref if V+ isn't present

Change-Id: Ia202d00ebee95e99018e7b04ef284de0bf3f1e1c

Conflicts:

	src/com/android/settings/WirelessSettings.java