Settings: disable keyguard widget frame (2/2)

Conflicts:
	res/values/slim_strings.xml

Change-Id: I23cd62d58d345278dc2b1dbeeefd574dc313e6c1
Merge "Settings: disable keyguard widget frame (2/2)" into kk