Merge "Use minimum resolution of supported resolutions" into nougat-mr1-cts-dev am: 00ff7b0046 am: 6d9e6d0246 am: 72188b4e76 am: 23befccacd am: 2506b8290a
am: 990a37eef4

Change-Id: I6435d99c6b8e7ada45644d7b7765d5506a8919e5