[automerger skipped] Make DreamService use an Activity am: 6861e91b84 am: b378a53f8b am: 907c0b7873 am: e7bbbf09ee -s ours
am skip reason: Change-Id I8dff0a124cd1b41fb925a73528305431b49ee06d with SHA-1 148478a85e is in history
Change-Id: I11a98e27704e8477eec22032aff3735b74957142
This commit is contained in: