Merge "Fix bug where lockscreen notification is minimized and not dismissable" into sc-dev am: f4a03dcd am: 69e210f8

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

Change-Id: Ifec625610e74f60d9bc0938cb5a29ddf7a66a08f