Merge "Add hidden API startActivityForResultAsUser" into oc-dev
am: bb14fb9acb

Change-Id: Iad4f51ffb4cdfaef1aeb312f92284cfad309b978