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

[automerger skipped] Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-v2-dev am: af55b441 -s ours am: 3065cdc7 -s ours am: 284c6ea5 -s ours am: 01d1ab8c -s ours am: 51f070b1 -s ours

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

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



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