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

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

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