Merge commit '6fa418fde74c6e2bb22c4d28602178efea7927b0' into remote

Conflicts:
	base.mk
	device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml

Change-Id: Id3c174e34ea301bec6aed82f70f74f561272ea8e