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

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