Merge "Check for null application context in UserManager." into tm-qpr-dev

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();
     }