[conflict] Merge "Use rule package name in addAutomaticZenRule; specify...

[conflict] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into tm-dev am: 0232c797

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



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