Merge "Use system api for shell command handling"

import android.net.util.LinkPropertiesUtils.CompareResult;

import android.net.util.MultinetworkPolicyTracker;

import android.net.util.NetdService;

import android.os.BasicShellCommandHandler;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;

import android.os.PowerManager;

import android.os.Process;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ServiceManager;

import android.os.ServiceSpecificException;

import android.os.ShellCallback;

import android.os.ShellCommand;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

    }

    @Override

    public void onShellCommand(@NonNull FileDescriptor in, @NonNull FileDescriptor out,

            FileDescriptor err, @NonNull String[] args, ShellCallback callback,

            @NonNull ResultReceiver resultReceiver) {

        (new ShellCmd()).exec(this, in, out, err, args, callback, resultReceiver);

    public int handleShellCommand(@NonNull ParcelFileDescriptor in,

            @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err,

            @NonNull String[] args) {

        return new ShellCmd().exec(this, in.getFileDescriptor(), out.getFileDescriptor(),

                err.getFileDescriptor(), args);

    }

    private class ShellCmd extends ShellCommand {

    private class ShellCmd extends BasicShellCommandHandler {

        @Override

        public int onCommand(String cmd) {

            if (cmd == null) {