[automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in...

[automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into sc-qpr1-dev am: 15b2a7d5 -s ours am: 0b497693 -s ours am: d5b20533 -s ours am: 6913edd3 -s ours

am skip reason: subject contains skip directive

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



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