Merge "Use minimum resolution of supported resolutions" into nougat-mr1-cts-dev