Merge "Add supports 2k and 8k to MediaDeviceInfo" into nougat-cts-dev
am: 0b096599ee

Change-Id: If75ce9149cbb91caa7d351cf83adfaf139b85481