[automerger skipped] Merge "Remove connectivity monitor switch from developer options" into pi-dev am: 8d7ccc0074
am: 433cca7577  -s ours

Change-Id: Ia9177fc830d5f99ea2c9ace03a88ab62525c3642