This reverts commit cf55c210. Bug: 176018998 Test: atest DisplayModeDirectorTest Change-Id: Ib576e16257d7903b39efa8015c2af3be8c0d0c40 (cherry picked from commit b14bed88)