Merge "Move android.test classes from core/java to legacy-test/src" am: 2761ed124a am: 28b617bdea am: 7e28011fea
am: 0e4fc20971  -s ours

Change-Id: Ia1089230236d2ae31e3b8a96bcc20780a09dc949