add back for LockscreenTargets
Settings (MSIM): Refactor tab labels to use global sim name

Change-Id: I02d60901d4d16f3b16ede9c34dce8f000a79addc

Conflicts:
	src/com/android/settings/SelectSubscription.java
Settings: Minor string update for msim

Change-Id: I20edc79b291405b44cbf483f615c6473e5934de8

Conflicts:
	res/values/cm_strings.xml