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

Change-Id: I36a34d029f75195d4a865affef5257f1d4aa5d50