Merge "Add support for lazy conditions" into udc-dev am: f51f8677

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



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