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

Change-Id: Id94e38dafad3dd6a5316c53ba357a8004a7d7b9e