Merge changes from topic "am-48c30422afc64ae881c9d33c793f5814"

* changes:
  [automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into sc-dev am: 7dce594b -s ours am: 80d04071 -s ours am: 39ff7e53 -s ours am: 1ca8706a -s ours am: fe2d8445 -s ours
  [automerger skipped] Use rule package name in addAutomaticZenRule; specify "android" for all system apps am: 6e34748b -s ours am: 7a2f4736 -s ours am: e6f6edf3 -s ours am: cf7c0626 -s ours am: 53337a98 -s ours