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

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



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