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

Change-Id: Ib73ffbe26038c8c29ee520ea461499875e4d23f5