Merge "Migrate frameworks/base/core/tests/featureflagtests to androidx.test"