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

Change-Id: I7c34668b10ff0402918e8e582ec88480a321ca82