Merge "Merge "Add supported video resolutions to MediaDeviceInfo" into nougat-cts-dev am: b2ae26f42e" into nougat-mr1-cts-dev am: 23ebe62b3f am: 461257e157 am: 5de6427d8b
am: a9ab4f17e8

Change-Id: I21babc9af0fe33765361883eb67775e9d65c2a93