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

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