config/overlay: clean-up

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml
network: update wifi/p2p services

Conflicts:
	rootdir/init.qcom.rc
wifi: allow p2p function to be disabled on non-p2p interface