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

Change-Id: If4e6d21b1a68bb8609437c8ed0d67fb62d98f1ad