Merge "Invoke keyguard going away when it is collecting for wake" into...

Merge "Invoke keyguard going away when it is collecting for wake" into sc-v2-dev am: a5e7ce9b am: 6fe91cd7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15416099

Change-Id: I2c288de6d6994c7e237813a96eb6cddf60a60d70