Merge "Merge "Deduplicate resumption controls when notif removed" into rvc-dev am: 997a3c73 am: 0f9987be am: d0e2cd7a" into rvc-qpr-dev-plus-aosp am: d793630a

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

Change-Id: Ia63e08e566fc39dd5a6c2a262cc99999ed23ccfe