[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 rvc-dev am: 651383dd -s ours am: 68af0177 -s ours am: 587867b7 -s ours am: a99f8def -s ours am: ed175d90 -s ours am: 25929507 -s ours

am skip reason: subject contains skip directive

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



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