tree 32747d1cbed22d9fde4b34778c3e95ac16000667
parent 134e4b284be95cd8ad3dbb340bc1cae6b703dbd2
parent e7ca4fe6eefc9af222fc636a6f6de6c86f3a04f9
author Gus Prevas <kprevas@google.com> 1539872063 -0700
committer android-build-merger <android-build-merger@google.com> 1539872063 -0700

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

Change-Id: I5f36bac36447c4a7edb6b9df5be86d4caaa5b41b