Merge "LocalDisplayAdapter: don't crash when no color modes available" am: 24218db904 am: f15075c9f8
am: d0fff5284f

Change-Id: I319f88d1d88ff9e4b8507224ca7209eb7631dc99