Merge "Promote startActivityAsUser to SystemApi" into tm-dev