[automerger skipped] Add in test-module-name in AndroidTest.xml for some tests. am: 7d1ba4358c  -s ours
am: 1d98b83e45  -s ours

Change-Id: I1402566d344282b35aaa5a965b33306e44424add