Merge "Migrate frameworks/base/packages/Shell to androidx.test"