Merge "Use DeviceFeatureModuleController to run tests only if the device has the required feature." into main