Merge "Migrate system/extras to androidx.test" am: 37fb5e52bb
am: 7dd56279a3

Change-Id: I1eb9eb1d9cd8a093da560258ac1e4da22df681d5