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

Change-Id: I23231a13531e12669a3fdbba4a1c174eb4de0ee1