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: I8cd62193e6ce8d461ab074a8a6d0a3387fbe5776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>