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

Change-Id: I5f2d52570334b1a73bdc72c3efd29b566c8fd390