am a1976879: Merge "Camera: change supported preview/video size logic" into lollipop-cts-dev automerge: 6a44e14

* commit 'a1976879275682edbb8132fabecdd3ae44a7ce69':
  Camera: change supported preview/video size logic