Bring in DeviceSettings

Conflicts:
	overlay/packages/apps/Settings/res/values/bools.xml

Change-Id: I74328cebce5d809b14478fb43c11d5d565bb86e2