Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-dev am: 269deccf66 am: 04839f0199 am: ebfd947aaa am: 6785de91a9 am: ca71c4edc6 am: bc4b60ac0d

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

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