[automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev am: e0ddfb666d am: fb7e019e1d -s ours am: a5b0e8c2e7 -s ours

am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 7e58ab94f9 is already in history

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

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