Merge "Deduplicate resumption controls when notif removed" into rvc-dev am:...

Merge "Deduplicate resumption controls when notif removed" into rvc-dev am: 997a3c73 am: af41f0ac am: 2575f166

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

Change-Id: Ibc9a7008c3687003a6c2f990e3d20c7553c09c0e