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

* changes:
  Merge "[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c5 am: b5e74c1c -s ours am: 8cfe99d2 -s ours am: 167fa8ba -s ours" into sc-dev am: 8449f44b -s ours am: 06162dae -s ours am: 7396c4d4 -s ours am: 82d9abd0 -s ours am: e83c2600 -s ours
  [automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c5 am: b5e74c1c -s ours am: 8cfe99d2 -s ours am: 167fa8ba -s ours am: 8583d6ea -s ours am: a09891ec -s ours am: 111e477a -s ours am: 1e2ea3c0 -s ours am: 3e4b7f96 -s ours