[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 rvc-dev am: 177cff59 -s ours am: b44e95c6 -s ours am: 4c144d56 -s ours am: 64c4cbbc -s ours am: 55f0d8ad -s ours

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

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



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