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
Change-Id: I5ad2c30657986e8e73a0220858b3b009d910ab6a