[automerger skipped] Merge "Change TYPE_DREAM logic to use ACTIVITY_TYPE_DREAM" into rvc-dev am: 66b1dfe6aa am: c3b45b973c am: 404592740f am: b2d7f9c379 -s ours

am skip reason: Change-Id Ic4561cd0594d7a3465454221db256499dd06c145 with SHA-1 e059cd3714 is in history

Change-Id: Ic67ef3fb33a057c3ee0c9485945626d08ca35752