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

Change-Id: I8e198596eaec74fb022530544adad8efa0aadf52