Merge "Make ZenModeControllerImpl more robust" into udc-qpr-dev am: 07f027e5 am: 2970307d

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



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