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

Change-Id: I4e3f595731256c154a00c367ee7481e5d1c44639