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

Change-Id: I76813be6d41381ef616270a71df34ea2507639c6