We are supposed to use ActivityResultLaunchers, so do it that way Change-Id: I070ec485097c927877b3e0eb4699addc9b9df873