Add aberration correction and noise reduction keys to request and
response.

Bug: 326201504
Test: CtsCameraTestCases with test virtual camera enabled.
Change-Id: I382023caaac8fb7fcae0fc0e89f9b6f97febc7ad
diff --git a/services/camera/virtualcamera/util/MetadataUtil.h b/services/camera/virtualcamera/util/MetadataUtil.h
index 13c4797..b4d60cb 100644
--- a/services/camera/virtualcamera/util/MetadataUtil.h
+++ b/services/camera/virtualcamera/util/MetadataUtil.h
@@ -155,11 +155,20 @@
           camera_metadata_enum_android_color_correction_aberration_mode>&
           aberrationCorectionModes);
 
+  // See COLOR_CORRECTION_ABERRATION_MODE in CaptureRequest.java.
+  MetadataBuilder& setAberrationCorrectionMode(
+      camera_metadata_enum_android_color_correction_aberration_mode
+          aberrationCorrectionMode);
+
   // See NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES in CameraCharacteristics.java.
   MetadataBuilder& setAvailableNoiseReductionModes(
       const std::vector<camera_metadata_enum_android_noise_reduction_mode>&
           noiseReductionModes);
 
+  // See NOISE_REDUCTION_MODE in CaptureRequest.java.
+  MetadataBuilder& setNoiseReductionMode(
+      camera_metadata_enum_android_noise_reduction_mode noiseReductionMode);
+
   // See REQUEST_PARTIAL_RESULT_COUNT in CameraCharacteristics.java.
   MetadataBuilder& setRequestPartialResultCount(int partialResultCount);