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

Change-Id: Ia3bda6925daf06b762e6c926bea1b6ff4e640e58