[automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into sc-dev am: 7dce594bfe -s ours am: 80d04071c0 -s ours

am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 12372cd9dd is already in history

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

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