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

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

Change-Id: I5ed435e5e5821aee193502f16917334fe052a0b9