Merge "Fix NPE for the feature flag check" into tm-qpr-dev

        String requiredFeature = FEATURE_COMPANION_DEVICE_SETUP;

        FeatureInfo[] requestedFeatures = getPackageInfo(context, userId, packageName).reqFeatures;

        if (requestedFeatures != null) {

            for (int i = 0; i < requestedFeatures.length; i++) {

                if (requiredFeature.equals(requestedFeatures[i].name)) {

                    return;

                }

            }

        }

        throw new IllegalStateException("Must declare uses-feature "

                + requiredFeature