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

Merge "Add support for lazy conditions" into udc-dev am: f51f8677 am: 3c85cf74 am: 3bd63db7 am: 3c1c211d

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



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