Merge "Fix the tests in DisplayManagerServiceTest that were failing on auto devices."