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

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