Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""