Merge "Merge "Deduplicate resumption controls when notif removed" into rvc-dev am: 997a3c73a7 am: 0f9987bed9 am: d0e2cd7a7f" into rvc-qpr-dev-plus-aosp