cm: Pastefail

Change-Id: I51bae450b09a324231f9520b1623334c4202e869

Conflicts:
	overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml