This reverts commit 4a0a896acc.
Bug: 176018998
Test: atest DisplayModeDirectorTest
Change-Id: Ic9329c59c358742696adbbca9cc2b33f25787eb1
This reverts commit 4a0a896acc.
Bug: 176018998
Test: atest DisplayModeDirectorTest
Change-Id: Ic9329c59c358742696adbbca9cc2b33f25787eb1