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

    /** @hide */

    public UserManager(Context context, IUserManager service) {

        mService = service;

        mContext = context.getApplicationContext();

        Context appContext = context.getApplicationContext();

        mContext = (appContext == null ? context : appContext);

        mUserId = context.getUserId();

    }