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

Change-Id: If7c1a8dcbbb0a0d22372deecce2f89a8791084fc