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

Change-Id: Idcccd811808be32b492d8e2cb753439fc4d9de46