Merge "Add androidx.test libraries." into pie-cts-dev
am: 80adbfd128

Change-Id: Ia339230edb29c1f243a2b40512d0a8a78d94108a