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