Merge commit 'a308eec4e6f768e96d5c2ac662742a0ce6780ddb' into remote

Conflicts:
	device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
	rootdir/etc/init.qcom.rc

Change-Id: I0bf3d3bad8a8ee9f8e608ef46664dc4172fe0275