Revert "Fix dodgy states of keyguard transport controls"

This reverts commit bdb5ac7ddbabec0ba947a32937d8b95738d513dc.

Change-Id: Iea8db9a590a2a3b65d941b2918345eb27f690240
2 files changed