Fixing AOSP tests after AndroidX migration

Test: adb shell am instrument -w -r -e debug false com.android.launcher3.tests/androidx.test.runner.AndroidJUnitRunner
Change-Id: I72bf7095087b012a6eceac71ee02f2d7a5c8c51b
2 files changed