Make test_runner allow exclude_annotations along with test filters

Make test_runner allow exclude_annotations along with test filters

When running android instrumentation tests through test_runner, the
exclude_annotations rules will now take precedence over the test
filters, instead of being ignored.

BUG=425297
Committed: https://crrev.com/c4667365e4c28b4007ad9671bec4c3429e6238c2
Cr-Commit-Position: refs/heads/master@{#300486}

[mcdavid, 2014-10-20 21:52:46]

mcdavid@amazon.com changed reviewers:
+ jbudorick@chromium.org

[mcdavid, 2014-10-20 21:54:29]

FYI: I'm currently not in the AUTHORS file. If this looks good to you, could you
please add me to the AUTHORS file before submitting to the commit queue? Thanks!

[jbudorick, 2014-10-20 23:18:04]

On 2014/10/20 21:54:29, mcdavid wrote:
> FYI: I'm currently not in the AUTHORS file. If this looks good to you, could
you
> please add me to the AUTHORS file before submitting to the commit queue?
Thanks!

The easiest way to do this is just to add yourself to AUTHORS in this CL.

lgtm

[jbudorick, 2014-10-20 23:20:14]

On 2014/10/20 23:18:04, jbudorick wrote:
> On 2014/10/20 21:54:29, mcdavid wrote:
> > FYI: I'm currently not in the AUTHORS file. If this looks good to you, could
> you
> > please add me to the AUTHORS file before submitting to the commit queue?
> Thanks!
> 
> The easiest way to do this is just to add yourself to AUTHORS in this CL.
> 
> lgtm

and thanks for the patch!

[mcdavid, 2014-10-20 23:28:00]

I've added myself to the AUTHORS list, can you please add this to the CQ?

[jbudorick, 2014-10-21 00:33:05]

The CQ bit was checked by jbudorick@chromium.org

[commit-bot: I haz the power, 2014-10-21 00:34:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/668793002/20001

[commit-bot: I haz the power, 2014-10-21 02:37:02]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-21 02:37:03]

Exceeded time limit waiting for builds to trigger.

[jbudorick, 2014-10-21 13:55:07]

The CQ bit was checked by jbudorick@chromium.org

[commit-bot: I haz the power, 2014-10-21 13:55:37]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/668793002/20001

[commit-bot: I haz the power, 2014-10-21 14:46:34]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2014-10-21 14:47:16]

Patchset 2 (id:??) landed as
https://crrev.com/c4667365e4c28b4007ad9671bec4c3429e6238c2
Cr-Commit-Position: refs/heads/master@{#300486}