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