Merge "Protect ConnectivityService from SecurityException in permission check." am: 4637a72f05

Change-Id: I30d993e431b9d6486dcaebdc48c525a861301f70