Merge "Protect ConnectivityService from SecurityException in permission check."