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

Merge "Merge "Add support for lazy conditions" into udc-dev am: f51f8677 am: 27065326" into udc-d1-dev-plus-aosp am: bea3290f

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



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