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

Change-Id: I0d50f6bccc9fb18a54865b45a7e8d1eaff01ea9e