Merge "Check for null application context in UserManager." into tm-qpr-dev am: 109ae7874c

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

Change-Id: I1007c9bffb74335d73ca36e34de9ac7939baa3b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/os/UserManager.java

@@ -1971,7 +1971,8 @@ public class UserManager {
     /** @hide */
     public UserManager(Context context, IUserManager service) {
         mService = service;
-        mContext = context.getApplicationContext();
+        Context appContext = context.getApplicationContext();
+        mContext = (appContext == null ? context : appContext);
         mUserId = context.getUserId();
     }