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

Change-Id: Ie57f4bf24a6bc6be597cae5f06745fdf81c5eb2b