Include userId in the exception message for diagnostics

This is needed to restore the order of events causing
the issue. I'd prefer to check this locally, but the bug
is tricky to reproduce, only happened once on my device.

Bug: 131834071
Test: builds
Change-Id: I5ac2196de5b7583300ef2e7770aa093de86972b0