[automerger skipped] Use rule package name in addAutomaticZenRule; specify "android" for all system apps am: cf692cd0de -s ours am: 3b39ae4873 -s ours

am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 55bc086ebf is already in history

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

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