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

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

Change-Id: I23961f2739c6ab28eda0f31fd9c2e5823ccbf0c4