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

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

Change-Id: Ibb021c37451c574c28cbd851cbf4decd57264fc7