Merge "Replace CONNECTIVITY_INTERNAL in SystemUI" am: 3950a24dca am: 8d82c3cbd9

Change-Id: I0ef7475de6266ac7534e549a89a8418c8ea5bb3d