remove these mismerged overlays that are breaking network location
	modified:   overlay/frameworks/base/core/res/res/values/config.xml