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

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