Merge "Create ACTIVITY_TYPE_DREAM" into rvc-dev am: 389580c7da

Change-Id: Ifdc559beace47bff1298b52431ced1bd9effff12