Reenable CM features

These are back in place, re-enable them

Change-Id: I91289fa0a3a8d47a66ea7f1f2b39bc6ec2eb1be1
Merge branch 'cm' into HEAD

Signed-off-by: DHOMD <DHO@dho.im>

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

Change-Id: I82e1a9147b1b78748f7f0a8128823947ff81c124
Restore some setpped on vaues

Change-Id: I69a9b500c3d2cc9d18ee26d34cc80bc99131901e
selinux: Add missing file

derp...

Change-Id: Ide539688125d4ea3f3a5241aee092f572b004542
Merge branch 'cm' into HEAD