Merge "Camera2: fix testNoiseReductionModeControl" into lmp-dev