Merge "Camera: update FPS range check per spec update" into marshmallow-cts-dev