Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev