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

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



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