Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService" am: a150138e67
am: 773a92edb9

Change-Id: I14ef8eaa83b3df3b032556504a23e6b17f02435d