Merge "Use current user isntead of system user if no --user parameter is passed" into rvc-dev

package com.android.server.accessibility;

import android.annotation.NonNull;

import android.app.ActivityManager;

import android.os.ShellCommand;

import android.os.UserHandle;

                return null;

            }

        }

        return UserHandle.USER_SYSTEM;

        return ActivityManager.getCurrentUser();

    }

    @Override