Merge "Moved c.a.i.u.Predicate[s] into legacy-test" into oc-dev-plus-aosp