Merge "Replace CONNECTIVITY_INTERNAL in SystemUI"