Merge remote-tracking branch 'cm/cm-11.0' into HEAD

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

Change-Id: I1b23a334f4a5c2816dff781353120a139e3eb451