Merge "[automerger skipped] Check rule package name in...

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 am: 8449f44b -s ours

am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d62 is already in history

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



Change-Id: Ia32240e0de18447b8e4de1366940533e6ee0618d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>