[automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-qpr-dev am: aad71ae8d8 -s ours am: 3f90b84011 -s ours am: 9da4a79e7e -s ours am: 62a472683f -s ours am: 582819d96d -s ours am: 3bdcd8a212 -s ours

am skip reason: subject contains skip directive

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

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