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

Change-Id: Ia1f5e4f2d361e4b8883d6d090b1d92a1b6a8b06b