Merge "Make ZenModeControllerImpl more robust" into udc-qpr-dev am: 07f027e538

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

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