Merge "Move connectivity-sources to frameworks/base"