Merge "Condition Refactor." into tm-qpr-dev am: a4ba2978 am: c7edee1c

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



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