Merge "CameraService: Add support for @3.4 constructDefaultRequestSettings"