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

Change-Id: I0d3ccd83ef858c65716a09df5320622f6b4ec0bf