[automerger skipped] Merge "Use rule package name in addAutomaticZenRule;...

[automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into sc-dev am: 7dce594b -s ours am: 80d04071 -s ours am: 39ff7e53 -s ours am: 1ca8706a -s ours am: bae38f8b -s ours

am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 12372cd9 is already in history

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



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