[automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into sc-v2-dev am: f0c48d9172 -s ours

am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 55bc086ebf is already in history

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

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