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