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

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



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