Merge "Change TYPE_DREAM logic to use ACTIVITY_TYPE_DREAM" into rvc-dev am: 66b1dfe6aa am: 82ee98995e am: de7445f0ae

Change-Id: I539cf4de80f1c60de4881f19de6553fb94830b5a