Merge "Merge "SystemUI: Customize wifi indicator for China carriers" am: 439286d185 am: e0a06e21b2" into pi-dev-plus-aosp
am: 18f0207d73

Change-Id: Ieb479516b7037bbc2317974af4ac678faa43b4d0