Merge "Should use getSupportedVideoSizes()" into marshmallow-cts-dev am: 07ba022f2b
am: 55ec150397

* commit '55ec1503978bbe90b6d15a8fce773819f63747f2':
  Should use getSupportedVideoSizes()