Merge "Camera2: Update reprocess configuration test" into mnc-dev