[automerger skipped] Make DreamService use an Activity am: 6861e91b84 am: d5c8310562 am: 594c404d40 -s ours
am skip reason: Change-Id I8dff0a124cd1b41fb925a73528305431b49ee06d with SHA-1 6861e91b84 is in history
Change-Id: I29e69ef50b896376854c2f1cea44e3f199211244
This commit is contained in: