Merge "Remove spy() from ZenModeHelper in ZenModeHelperTest" into udc-dev am: 4db7d7ac

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



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