Merge "Clean up Predicate related code in android.test"
am: 1230b249f1  -s ours

Change-Id: I4836793deccd83e06129ad18035f4f4acf5f8617