Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be7 am: 9e99b9ee Change-Id: I289950cff0cdc6b5ad301936c7b55eadee5fd0f8