[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 am: e7331ca5 am: 9dd23923

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



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