Merge "Reset messages when the keyguard isn't showing" into sc-dev am: fb4aa06b am: 15dcde91

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

Change-Id: Ic789b971e350121c77e4736b64fd100f3fb425da