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