Merge "Keyguard: Don't show when booting to cryptkeeper" into oc-mr1-dev am: 89eceea5ca
am: 93dac12f10

Change-Id: I1c80000d63c791f1901ea4f68e246ca8dd38b668