[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: 1d34dc7c

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



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