Merge "Resolve conflicting values of usesCleartextTraffic for shared processes"