Merge changes from topic "am-e32d35e3d2634480a5b87af5e15839c4" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into sc-qpr1-dev am: 96f963e6 -s ours am: d93b150b -s ours am: db0ccc17 -s ours am: 89119b32 -s ours
  [automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: 4bdb5f98 -s ours am: 119ed2c9 -s ours am: 3458f9d2 -s ours am: 570887bd -s ours