Assign original activityType of Task to new undefined activity.

Was just re-assigning to itself (which was undefined) so it'd
remain undefined.

Bug: 154145745
Test: added testActivityAndTaskGetsProperType
Change-Id: I36183057a5d43f6845336d0e6bb6fc8101a1ecff