[automerger skipped] Merge "Make SelectTest append selectTest argument from extended class" am: 96cf453355 am: bf2309beae
am: b7d958b944 -s ours
am skip reason: change_id I83d13d9ef82a92677bee67da5ee8a5faa0690f82 with SHA1 9648d4b04b is in history

Change-Id: I6d32e3b22535b84fa63e2536587d4d7667c5b99c