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