Merge "Merge "Fix adb shell cmd activity get-config --proto --device fail" am:...

        }

        FeatureInfo[] features = pm.getSystemAvailableFeatures();

        Arrays.sort(features, (o1, o2) ->

                (o1.name == o2.name ? 0 : (o1.name == null ? -1 : o1.name.compareTo(o2.name))));

        Arrays.sort(features, (o1, o2) -> {

            if (o1.name == o2.name) return 0;

            if (o1.name == null) return -1;

            if (o2.name == null) return 1;

            return o1.name.compareTo(o2.name);

        });

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

            if (features[i].name != null) {

                if (protoOutputStream != null) {