[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-v2-dev am: 037ec4b4 -s ours am: 2509cbd5 -s ours am: 6c2d124d -s ours am: f0a1f7be -s ours am: f491ac44 -s ours

am skip reason: subject contains skip directive

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



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