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

Change-Id: Idad772522638c93a1d2a042aa374ec2cabf55167