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

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

Change-Id: Ibe6c1d09a1862dd10a638197e8bc10ea9846a2db