Merge changes from topic "am-3424c0e0685c4358948cd52266e753e8"

* changes:
  [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: d9b587d6 -s ours
  [automerger skipped] Use rule package name in addAutomaticZenRule; specify "android" for all system apps am: b5ec639b -s ours am: def21382 -s ours am: 63474cc8 -s ours am: 624a5905 -s ours am: d322fcae -s ours am: 1ccc77d2 -s ours