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

Change-Id: I1f8f2a01bfa5bf8f1995efb85df89098a2ec21ea