Merge "Add hidden API startActivityForResultAsUser" into oc-dev