Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp am: 50826c5f2e
am: 4f9d89a380

Change-Id: I24b978bb63875ed7e1af7041f8ecbbfc482e0614