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

[automerger skipped] Merge "Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into tm-dev am: 3bc0d506 am: 91b0a982" into tm-d1-dev-plus-aosp am: 2fc9567f -s ours

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

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



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