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