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

Change-Id: Idde6b4548f44eefb5633ee88f1a497b72f7d7f42