Merge "Merge "Assign original activityType of Task to new undefined activity."...
Merge "Merge "Assign original activityType of Task to new undefined activity." into rvc-dev am: fb9a1917 am: 995d629c" into rvc-d1-dev-plus-aosp am: 4b7ce1cd am: fe3171b9
Change-Id: I5d63c27db4bee9480326cf2f88bc0030759d4265