[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 am: be808625

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



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