Merge "Use minimum resolution of supported resolutions" into nougat-mr1-cts-dev
am: 00ff7b0046

Change-Id: I5df845cd3c67bdd2870a4e84553bea3fa8286ff3