Settings: forward port lock pattern grid size (2/2)

Change-Id: I7078d703c218cd096d9b77c003a94b52fbce6322

Conflicts:
	res/values/slim_strings.xml
9 files changed