Merge "Also all EXTRA_USER as input for ACTION_SHOW_ADMIN_SUPPORT_DETAILS"

        }

        admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);

        if (intent.hasExtra(Intent.EXTRA_USER)) {

            admin.user = intent.getParcelableExtra(Intent.EXTRA_USER);

        } else {

            int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());

            if (userId == UserHandle.USER_NULL) {

                admin.user = null;

            } else {

                admin.user = UserHandle.of(userId);

            }

        }

        return admin;

    }