Merge "[automerger skipped] Merge "Add androidx.test libraries." into pie-cts-dev am: 80adbfd128 -s ours
am: 7c6266e297 -s ours
am skip reason: change_id I44a3e0234494df7b39b10d0728ebecb95b48fbc1 with SHA1 f55aa44551 is in history

Change-Id: If919269eaec0f0596ca41c171f487a5e41669f59