Merge "Migrate frameworks/rs to androidx.test" am: fbcad2dae5
am: 60d70376d4

Change-Id: I7c75e0f93e02fbf8ccbf23896b1755e8ce0d9818