Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-dev