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

Change-Id: I478628b001e0a9d1b683885a0b8fba0c21adfb72