Merge "Update cellular data condition icon and padding." into pi-dev am: 1a38390728
am: 8907b93d07

Change-Id: I1f6c63ad8c8d3a3d020a7ece8fd540ac77427650