Merge "Replace CONNECTIVITY_INTERNAL in SystemUI"
am: 3950a24dca

Change-Id: I576bb0f47831d6559c877176fc1beb24a0abfd2d