am bb064a9b: am e6992ac8: Change to display correct network name on...
am bb064a9b: am e6992ac8: Change to display correct network name on locked/quick settings screen. automerge: fdb22c9e
* commit 'bb064a9b':
Change to display correct network name on locked/quick settings screen.