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

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

Change-Id: Ibeb89d3d619d37fbc69ab95784b7dfa749afa5df