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

Change-Id: I508be6dffb182e6519d0e69db8e7aca9e204a523