Merge "Add ability to AND and OR conditions together" into tm-qpr-dev am: 9038b06d am: 6e17b119

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



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