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

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



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