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

[automerger skipped] Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into tm-dev am: 3bc0d506 am: 58581650 -s ours

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

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



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