Merge "Update ZenModeHelper & Test for refactor of DND atoms out of...

Merge "Update ZenModeHelper & Test for refactor of DND atoms out of atoms.proto." into udc-dev am: 9a849a65

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



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