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

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

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