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: Ia3015d11f93baf86b2b5e2961d9c5cc934a047b4