Merge "Conditions Monitor as singleton." into udc-dev am: b3096501 am: aba7eebe

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



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