Merge "Remove framework-connectivity-proto from platform"