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

Change-Id: I24f5c280be0107080d66ee793999e5e0e5ffe8ac