Bug: 141771803
Bug: 133216167
Test: atest DreamManagerServiceTests
Test: make checkbuild
Merged-In: I937061138bc8ccaf4475674f00331c3fe1c5a495
Change-Id: I937061138bc8ccaf4475674f00331c3fe1c5a495
(cherry picked from commit 4467c53c11)
Bug: 141771803
Bug: 133216167
Test: atest DreamManagerServiceTests
Test: make checkbuild
Merged-In: I937061138bc8ccaf4475674f00331c3fe1c5a495
Change-Id: I937061138bc8ccaf4475674f00331c3fe1c5a495
(cherry picked from commit 4467c53c11)