Merge "[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c5 am: b5e74c1c -s ours am: 8cfe99d2 -s ours am: 167fa8ba -s ours" into sc-dev