Merge "Remove connectivity monitor switch from developer options" into pi-dev
am: 8d7ccc0074

Change-Id: Ic68439308f7d591595876488afa76e57b9414089