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

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

Change-Id: I6738db370f423d28e982b99e2ac2d3639ca39eed