Merge "Override handleShellCommand() in NPMS."

import android.os.INetworkManagementService;

import android.os.Message;

import android.os.MessageQueue.IdleHandler;

import android.os.ParcelFileDescriptor;

import android.os.PersistableBundle;

import android.os.PowerManager;

import android.os.PowerManager.ServiceType;

import android.os.Process;

import android.os.RemoteCallbackList;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ShellCallback;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

    }

    @Override

    public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,

            String[] args, ShellCallback callback, ResultReceiver resultReceiver) {

        (new NetworkPolicyManagerShellCommand(mContext, this)).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 NetworkPolicyManagerShellCommand(mContext, this).exec(this,

                in.getFileDescriptor(), out.getFileDescriptor(), err.getFileDescriptor(), args);

    }

    void setDebugUid(int uid) {