[automerger skipped] Merge "Add android.test.* api files" into pi-dev-plus-aosp
am: 4341dbc5fb  -s ours

Change-Id: Ic4bc7742f57df1f3d1a2a67ff2d8d33fb5f66c50