[automerger skipped] Merge "Use rule package name in addAutomaticZenRule;...

[automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into sc-qpr1-dev am: c37b90d7 -s ours am: d54fc8c2 -s ours am: 9566172e -s ours am: 1de6117a -s ours

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

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



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