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

Change-Id: I866ff446d7ed705ccb8b4bce2df79e5462a4daa9