Add userId to log messages - DO NOT MERGE

Add the user ID so it's easier to see which user log messages refer to.

There's a bit of churn around conditionals in this to ensure that the
code complies with the style guidelines.

Fixes: 148376687
Test: make RunBackupFrameworksServicesRoboTests
Change-Id: I3ca92d21492fae4b89cb73fb39db1a490c796f5d
2 files changed