Merge "Merge "Display mobile data type icons in status bar." into pi-dev am: b87b032786" into pi-dev-plus-aosp
am: 879720cb87

Change-Id: Ib79a4d2bf3fe82491929e7e9bf474ef2de8cfe92