[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-qpr-dev am: aad71ae8 -s ours am: 3f90b840 -s ours am: 9da4a79e -s ours am: 62a47268 -s ours am: 582819d9 -s ours

am skip reason: subject contains skip directive

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



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