[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 tm-dev am: e80f89c2 -s ours am: f78f6c1d -s ours am: feb15205 -s ours am: 82021121 -s ours

am skip reason: subject contains skip directive

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



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