Merge "Merge "Add supported video resolutions to MediaDeviceInfo" into nougat-cts-dev am: b2ae26f42e" into nougat-mr1-cts-dev
am: 23ebe62b3f

Change-Id: I2ee4095b0f269e00eae6d9aa34e2521c9396ae0f