Merge "Don't wait keyguard drawn if device has no keyguard" am: a6e5165b2c
am: 94ec9e3e4b

Change-Id: I1391b28a04611f4e4445d53d3323fad8fb98528f