Merge "Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into tm-qpr-dev am: 4863213053 am: bbe209f551

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

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