Merge changes from topic "am-25e2d8b042ea4b7cbe859cb367d180da"

* changes:
  [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: 1935b162 -s ours
  [automerger skipped] Use rule package name in addAutomaticZenRule; specify "android" for all system apps am: 12372cd9 -s ours am: 0e2bba06 -s ours am: d10f38ce -s ours am: 89b7d5c0 -s ours