Merge "Dump user id in dumpsys activity starter" into oc-dev am: b55b842898
am: 13df994243

Change-Id: Ia38529b06e7859884531f945fa32770017f11467