Merge "Don't even think about changing keyguard transit" into oc-dev
am: 3e3bb5f762

Change-Id: I5ad8b077de7bbe692ac22e07fd2fb7ccb9264500