Merge branch 'origin/cm-11.0'

Signed-off-by: Andre Saddler <dresadd09691@gmail.com>

Conflicts:
	BoardConfigCommon.mk
	common-proprietary-files.txt
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/frameworks/base/core/res/res/values/dimens.xml
	overlay/packages/apps/Settings/res/values/config.xml