Merge "The AdminSupportDetails intent creation preserves the original admin user ID." into qt-dev

            if (admin.component != null) {

                intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, admin.component);

            }

            final UserHandle adminUser = admin.user != null

                    ? admin.user

                    : UserHandle.of(UserHandle.myUserId());

            intent.putExtra(Intent.EXTRA_USER, adminUser);

            intent.putExtra(Intent.EXTRA_USER, admin.user);

        }

        return intent;

    }