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

[automerger skipped] Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-qpr1-dev am: 96f963e6 -s ours am: d93b150b -s ours am: db0ccc17 -s ours am: 89119b32 -s ours am: 98cf92a6 -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/+/19744481



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