Merge "Clean up Predicate related code in android.test" am: 1230b249f1  -s ours am: 1cd40dac5c am: 8e6690f35a
am: 30a1f0eb8c

Change-Id: Ic45017c7f48eb9baa2dceaf4504b6f8a2d8f081d