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

Change-Id: If29cf2a91dc5d91a50aa7d51604f0a054fce352a