[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-v2-dev am: f0c48d91 -s ours am: 5224af9c -s ours am: e9163fea -s ours

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

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



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