Merge "Fix package name usage for disabled providers"

      // TODO: get from the actual service info

      val packageManager = context.packageManager

      return providerDataList?.map {

        val componentName = ComponentName.unflattenFromString(it.providerFlattenedComponentName)

        var packageName = componentName?.packageName

        if (componentName == null) {

          // TODO: Remove once test data is fixed

          packageName = it.providerFlattenedComponentName

        }

        val pkgInfo = packageManager

          .getPackageInfo(it.providerFlattenedComponentName,

                .getPackageInfo(packageName,

                        PackageManager.PackageInfoFlags.of(0))

        DisabledProviderInfo(

          icon = pkgInfo.applicationInfo.loadIcon(packageManager)!!,