[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 qt-dev am: e0ddfb66 am: fb7e019e -s ours am: a5b0e8c2 -s ours am: 853c9d7b -s ours am: 71382487 -s ours

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

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



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