Merge "Revert "Promote startActivityAsUser to SystemApi"" into tm-dev