Merge "[automerger skipped] Check rule package name in...

Merge "[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: 3201baad -s ours am: 69665250 -s ours am: a35e748e -s ours am: 2967f710 -s ours am: 2c6dc31b -s ours am: f9382f64 -s ours am: caebd910 -s ours" into tm-d1-dev-plus-aosp am: 0341065d -s ours am: e42ee021 -s ours

am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 59732d62 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744598



Change-Id: I49ce98271d1e724730288061bdb1a6ee177e5835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>