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