Merge "Fix bug where lockscreen notification is minimized and not dismissable"...

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

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

Change-Id: I4ee7b402339be5c7d63be975d35da42384b8a841