Merge "Prevent bell icon from disappearing on immediate followup...

Merge "Prevent bell icon from disappearing on immediate followup notification." into rvc-qpr-dev am: a5685971

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

Change-Id: Ic5e0ee6eef7209f4426055601eb851fd305a282f