[automerger skipped] Merge "Add android.test.* api files" am: bf6cc57264
am: 56a8863d45  -s ours

Change-Id: Ie5ad592cc00eae7ca4d9c1e4d35c4cb52529093b