[automerger skipped] Merge "Add generic SelectTest JUnit filter and CoreTestsFilter" am: 4864bfa722 am: 713b4ac76f
am: 53067713f7 -s ours
am skip reason: change_id Ic72637997bf17debef914e2596049f6cf3e753de with SHA1 2bc664065e is in history

Change-Id: I061a9a75c7267ffcbb9f923006555be47d9c31f9