[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-dev am: d04e7381 am: 00ff6a99 -s ours am: dac6674f -s ours am: 369fde39 -s ours am: 814d768b -s ours am: 8d9b30a5 -s ours

am skip reason: subject contains skip directive

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



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