Merge "Should use getSupportedVideoSizes()" into marshmallow-cts-dev am: 07ba022f2b am: 55ec150397 am: 23a5cfe8b5 am: 0c6c3f38da
am: a83fe7c61a  -s ours

* commit 'a83fe7c61a9902f40607b18c414d09357c430240':
  Should use getSupportedVideoSizes()