Merge "Use rule package name in addAutomaticZenRule; specify "android" for all...

Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into tm-qpr-dev am: c9de1e52

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



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