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

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