[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 rvc-qpr-dev am: e0b757e6 -s ours am: b7fb1dd4 -s ours am: 62dec4d8 -s ours am: e37c182f -s ours am: 2fe7dc1b -s ours

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

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



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