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

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

Change-Id: Ib52ab2ebc65819a8593bb458add40d6bf1244bc6