[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 qt-dev am: 0852b61d am: 74525f50 -s ours am: 349169cf -s ours am: b74d0aa2 -s ours am: 8382cbfd -s ours am: 24492124 -s ours am: 7ab3660a -s ours

am skip reason: subject contains skip directive

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



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