Pass userPreferredMode separately from defaultMode

DisplayModeDirector later would need to know what is
the userPreferredMode. Having userPreferredMode
stored on defaultMode do not allow DisplayModeDirector
to distinguish between these two.

This CL passes userPreferredMode separately from
defaultMode.

Change-Id: I312a7c605a012dab14bb20635e6210cd3cdce8b3
Bug: 297018612
Test: atest DisplayInfoTest
4 files changed