Merge changes from topic "am-f392d312a56d413f8a72e2a69b41095e"

* changes:
  [automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into rvc-dev am: 177cff59 -s ours am: b44e95c6 -s ours am: 4c144d56 -s ours am: 64c4cbbc -s ours am: 55f0d8ad -s ours am: 2e55c7c4 -s ours am: 008013a5 -s ours
  [automerger skipped] Use rule package name in addAutomaticZenRule; specify "android" for all system apps am: 7e58ab94 -s ours am: fd9c2777 -s ours am: 2a1d2931 -s ours am: cf47b7b1 -s ours am: 21436e4d -s ours am: 4b7ee95b -s ours am: e983fb5f -s ours