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

Conflicts:
	BoardConfigCommon.mk
	extract-files.sh
	modules/batt_health/logger.h
	modules/mot_boot_mode/mot_boot_mode.c
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/packages/apps/Settings/res/values/config.xml
	qcom-common.mk
	sepolicy/mpdecision.te
	sepolicy/netmgrd.te