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 qt-dev am: e0ddfb66

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



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