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