Merge "Use UserManager.removeUserOrSetEphemeral() to remove current user."