Ensure restored (deleted+added) rules are neither active nor snoozed

Also tweak the "preserve" step to add a *copy* of the rule to the deleted map, instead of the rule itself. While this shouldn't really affect the outcome (because the rule will be removed from automaticRules shortly) it's better not to mess with its state.

Fixes: 322482703
Test: atest ZenModeHelperTest
Change-Id: I9e14f1ece61946332b8b5883ff7e782f832f47fd
3 files changed