Merge "Checks keyguard earlier when blocking notifications." into pi-dev
am: e7ca4fe6ee

Change-Id: I5f36bac36447c4a7edb6b9df5be86d4caaa5b41b