Merge "Gets the userId from Context for AccessibilityManager in ToastPresenter." into rvc-dev am: c53014cbf6 am: b5d47c488c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11898404

Change-Id: Id904468a68ffd1e9eb4c89739140b247e7afe4b5

core/java/android/widget/ToastPresenter.java

@@ -27,7 +27,6 @@ import android.content.res.Resources;
 import android.graphics.PixelFormat;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.os.UserHandle;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -90,7 +89,7 @@ public class ToastPresenter {
         //      context to it. This is problematic for multi-user because callers can pass a context
         //      created via Context.createContextAsUser().
         mAccessibilityManager = new AccessibilityManager(context, accessibilityManager,
-                UserHandle.getCallingUserId());
+                context.getUserId());
 
         mParams = createLayoutParams();
     }