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

Change-Id: I5b73df5e46d26d2008dba7a34345a0c37c099514