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

Change-Id: Ib349032c4e58deb04599f2431892f7d9138a1ac9