am cce961c1: am 22626107: Merge "Fix bug where transport shows all the time in...
am cce961c1: am 22626107: Merge "Fix bug where transport shows all the time in keyguard" into jb-mr2-dev
* commit 'cce961c1':
Fix bug where transport shows all the time in keyguard