Cleanup

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/packages/apps/Settings/res/values/config.xml

Change-Id: I5072f23827b7ec6471d0ba0cb873506b81ceaf85