Merge changes from topic "am-c66ed2d121e145c8a95a6da02fae6e7a" into rvc-d1-dev-plus-aosp
* changes:
Merge "Add userId to log messages - DO NOT MERGE" into rvc-dev am: 5191bb75 am: fd6ae225
Add userId to log messages - DO NOT MERGE am: c4d9e91f am: 69c86772