am 434b4acb: am 90fa5331: Merge "Don\'t show keyguard until the device has...
am 434b4acb: am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev
* commit '434b4acb':
Don't show keyguard until the device has been provisioned.